When a merge is done for models stored in a SCM system such as Git or ClearCase, it is important to understand how to commit the merge results both to properly record the merge in the SCM system and to save the resulting model in the local workspace. The important aspect is that it is necessary to press the Commit button to save the results. It is not enough to exit the merge dialog via the Close button or to close the dialog using the X button in the top-right corner of the window.
